Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 1 Jun 2011 02:49:51 +0000 (19:49 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 1 Jun 2011 02:49:51 +0000 (19:49 -0700)
commit51adee7feb941d1e6f1d52ddaf2e8a4fec05c7d2
tree50f2bccbbf2c6330f8870db677b3522109ce24b2
parentfd96244c2760a60822fc47a35f05b7eec2299dcc
parenta6b4e01a7658b15277a1c0b483e4c0dacfcae72b
Merge from trunk.
src/ChangeLog